removed redundant conditional.

2008-10-30  Sven Neumann  <sven@gimp.org>

	* gtk/gtkwidget.c (gtk_widget_get_property): removed redundant
	conditional.

svn path=/trunk/; revision=21731

diff --git a/ChangeLog b/ChangeLog
index e70b4427eba38eda1a699377967c58c6c79dce65..6feff1c1acc7b3658e25228a1baa44c584ffccab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-30  Sven Neumann  <sven@gimp.org>
+
+       * gtk/gtkwidget.c (gtk_widget_get_property): removed redundant
+       conditional.
+
 2008-10-30  Christian Dywan  <christian@imendio.com>
 
        Bug 557316 – GtkLinkButton should consider user-defined tooltip

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index d6dcc12c3e27851a911c9ca134830ba8a7243ca3..02096596bcb3513938a8b6f672f68b4314a94989 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2542,10 +2542,7 @@ gtk_widget_get_property (GObject         *object,
        g_value_set_static_string (value, "");
       break;
     case PROP_PARENT:
-      if (widget->parent)
-       g_value_set_object (value, widget->parent);
-      else
-       g_value_set_object (value, NULL);
+      g_value_set_object (value, widget->parent);
       break;
     case PROP_WIDTH_REQUEST:
       {